From: Kenichi Handa <handa@m17n.org>
Date: Tue, 28 Jul 2009 02:07:54 +0000 (+0000)
Subject: (font_parse_xlfd): Check DPI and AVGWIDTH properties more rigidly.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11286
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2c1e567fcdd506e186749a555ade82caec38b857;p=emacs.git

(font_parse_xlfd): Check DPI and AVGWIDTH properties more rigidly.
---

diff --git a/src/font.c b/src/font.c
index d2cd1febe93..cfc48523d12 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1139,7 +1139,10 @@ font_parse_xlfd (name, font)
 	    }
 	}
 
-      ASET (font, FONT_DPI_INDEX, INTERN_FIELD (XLFD_RESY_INDEX));
+      val = INTERN_FIELD (XLFD_RESY_INDEX);
+      if (! NILP (val) && ! INTEGERP (val))
+	return -1;
+      ASET (font, FONT_DPI_INDEX, val);
       val = INTERN_FIELD (XLFD_SPACING_INDEX);
       if (! NILP (val))
 	{
@@ -1151,8 +1154,10 @@ font_parse_xlfd (name, font)
       p = f[XLFD_AVGWIDTH_INDEX];
       if (*p == '~')
 	p++;
-      ASET (font, FONT_AVGWIDTH_INDEX,
-	    font_intern_prop (p, f[XLFD_REGISTRY_INDEX] - 1 - p, 0));
+      val = font_intern_prop (p, f[XLFD_REGISTRY_INDEX] - 1 - p, 0);
+      if (! NILP (val) && ! INTEGERP (val))
+	return -1;
+      ASET (font, FONT_AVGWIDTH_INDEX, val);
     }
   else
     {